Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Mar 2010 21:52:24 +0000 (21:52 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Mar 2010 21:52:24 +0000 (21:52 +0000)

Trivial merge